Merge branch 'master' into replace-bug
authorJohn Ericson <Ericson2314@yahoo.com>
Thu, 14 Jul 2016 19:08:00 +0000 (12:08 -0700)
committerGitHub <noreply@github.com>
Thu, 14 Jul 2016 19:08:00 +0000 (12:08 -0700)
commit3f655e54a45e130d45098ae3ad251774fc1b7179
tree6f86b98dde242b52b22f61d3bd17ea28127216a0
parent0619971fac8bdfa416eda76c6e4494dd83c19d3a
parent696e615f2686d9a2e2e113576d13eed0ec5db7d7
Merge branch 'master' into replace-bug
src/cargo/core/resolver/mod.rs